Always include dispextern.h before cm.h.

diff --git a/src/dispnew.c b/src/dispnew.c
index 35fba210be5b4a641378510047938a7bf4228af6..e9978749e2a47966702b591e32a94010656db85e 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -29,13 +29,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "termchar.h"
 #include "termopts.h"
 #include "termhooks.h"
-#ifdef HAVE_NTGUI
+/* cm.h must come after dispextern.h on Windows.  */
 #include "dispextern.h"
 #include "cm.h"
-#else
-#include "cm.h"
-#include "dispextern.h"
-#endif /* HAVE_NTGUI */
 #include "buffer.h"
 #include "frame.h"
 #include "window.h"